Skip to content

Use engine commit hash when vendoring sources #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2025

Conversation

staticlibs
Copy link
Collaborator

This PR brings duckdb/duckdb-odbc#84 changes to JDBC repo.

Testing: no code changes, no new tests.

@@ -58,6 +59,10 @@ jobs:
run: |
git push -u origin HEAD

- name: Wait for push to complete
if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request'
run: sleep 10 # Give GitHub a moment to process the push
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you expand on why this sleep is necessary? Doesn't the push complete otherwise?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

M, I've just copied this bit from the latest ODBC workflow to keep JDBC in sync with it. I will re-check.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As an update on this, I've got some input on GH workflows from Carlo, as a result the vendoring process in ODBC is being changed to import engine sources into a separate branch, create a PR on this branch and merge this PR automatically. In this variant the testing workflow is dispatched by triggering the pull_request event instead of a direct dispatch, so we do not need to wait manually until the push completes. I intend to bring the same workflow changes to JDBC once they are approved for ODBC, keeping this PR as a "draft" for now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the timeout, now using push event instead that is expected only to be triggered by Github after the push is actually complete. Also removed the periodic trigger and submitted duckdb/duckdb/pull#17099 on the main DuckDB repo side to notify the JDBC vendoring process.

@staticlibs staticlibs marked this pull request as draft March 27, 2025 00:39
This PR brings duckdb/duckdb-odbc#102 changes to JDBC repo. The
intention is to only run `Vendor.yml` workflow on a dispatch call from
the mainline DuckDB after the CI runs are passed and extensions are
built. On DuckDB engine side the workflow dispatch call is being added
in duckdb/duckdb#17099 .
staticlibs added a commit to staticlibs/duckdb that referenced this pull request Apr 14, 2025
This change adds a dispatch call to `Vendor.yml` JDBC workflow the same
way it is now done for ODBC repo. On JDBC side the workflow changes are
being added in PR duckdb/duckdb-java#172 .
@staticlibs
Copy link
Collaborator Author

staticlibs commented Apr 14, 2025

@carlopi I wonder if you can look at this PR too along with the duckdb/duckdb#17099 .

@staticlibs staticlibs marked this pull request as ready for review April 14, 2025 00:32
Mytherin added a commit to duckdb/duckdb that referenced this pull request Apr 21, 2025
This change adds a dispatch call to `Vendor.yml` JDBC workflow the same
way it is now done for ODBC repo. On JDBC side the workflow changes are
being added in PR duckdb/duckdb-java#172 .

ODBC call was initially added in #16730, see details in that PR.
@staticlibs staticlibs merged commit 0ae3204 into duckdb:main Apr 21, 2025
7 checks passed
@staticlibs
Copy link
Collaborator Author

Merging without review as a workflow-only change, and also to create the GH API entry point on duckdb-java side to be ready for upcoming calls from mainline DuckDB repo, that were enabled there earlier today with merged duckdb/duckdb#17099 .

@staticlibs staticlibs deleted the vendor_commit_id branch April 21, 2025 22:45
hmeriann pushed a commit to hmeriann/duckdb that referenced this pull request Apr 22, 2025
This change adds a dispatch call to `Vendor.yml` JDBC workflow the same
way it is now done for ODBC repo. On JDBC side the workflow changes are
being added in PR duckdb/duckdb-java#172 .
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants